From b7a38580710749e765f23b8792dd45bfe092c184 Mon Sep 17 00:00:00 2001 From: "mafetter@fleming.research" Date: Fri, 29 Oct 2004 08:28:20 +0000 Subject: [PATCH] bitkeeper revision 1.1159.140.1 (4181ff24XlmzOzk2yZmMG4lRU9Mr7Q) Added missing header dependencies. Added an optimize switch (defaults to "y") to make it easier to build "-g -O0 -fno-omit-frame-pointer" versions of xen. --- xen/Rules.mk | 2 ++ xen/arch/x86/Rules.mk | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 8b3128c38a..12fde1e8e4 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -4,6 +4,7 @@ debug ?= n debugger ?= n perfc ?= n trace ?= n +optimize ?= y # Currently supported architectures: # {COMPILE,TARGET}_ARCH := x86 @@ -19,6 +20,7 @@ HDRS := $(wildcard $(BASEDIR)/include/xen/*.h) HDRS += $(wildcard $(BASEDIR)/include/scsi/*.h) HDRS += $(wildcard $(BASEDIR)/include/hypervisor-ifs/*.h) HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h) +HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h) # compile.h is always regenerated, but other files shouldn't be rebuilt HDRS := $(subst $(BASEDIR)/include/xen/compile.h,,$(HDRS)) diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index e419bba514..fd4577f48c 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -4,10 +4,17 @@ CC := gcc LD := ld -CFLAGS := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing -O3 -CFLAGS += -iwithprefix include -Wall -Werror -fomit-frame-pointer -pipe +CFLAGS := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing +CFLAGS += -iwithprefix include -Wall -Werror -pipe CFLAGS += -I$(BASEDIR)/include -Wno-pointer-arith -Wredundant-decls +ifeq ($(optimize),y) +CFLAGS += -O3 -fomit-frame-pointer +else +x86_32/usercopy.o: CFLAGS += -O1 +endif + + # Prevent floating-point variables from creeping into Xen. CFLAGS += -msoft-float -- 2.30.2